582. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:38 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

582.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype7.rtl.css2018-06-13 18:14:40 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype7.rtl.css2021-03-24 04:31:10 +0000

582.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged918
Changed8374
Inserted00
Removed14

582.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

582.4 Active regular expressions

No regular expressions were active.

582.5 Comparison detail

1 .page-header.type7 .header.content:before{clear:both} 1 .page-header .switcher .options .action.toggle {padding-right: 0;}
2 .page-header.type7:not(.header-newskin) .minicart-wrapper{position:relative;margin:0;float:left} 2 .page-header.type7 .panel.header .switcher { margin-left: 10px; }
3 .page-header.type7:not(.header-newskin) .minicart-wrapper .action.showcart{display:block;line-height:15px} 3 .page-header.type7 .panel.wrapper {letter-spacing: .025em;min-height: 48px;}
4 .page-header.type7:not(.header-newskin) .minicart-wrapper .action.showcart:before,.page-header.type7 .minicart-wrapper .action.showcart.active:before{line-height:15px;font-size:14px;overflow:visible;vertical-align:middle} 4 .page-header.type7 .header.panel > .header.links > li.greet.welcome {padding-top: 5px;padding-bottom: 5px;}
5 .page-header.type7:not(.header-newskin) .minicart-wrapper .action.showcart .counter.qty{position:static;vertical-align:middle;margin:0;padding:0;font-size:11px;font-weight:400;height:auto;line-height:15px;text-transform:uppercase;width:auto;min-width:0} 5 .page-header.type7 .main-panel-top .panel.header+.gap {background: #e7e7e7;}
6 .page-header.type7:not(.header-newskin) .minicart-wrapper .action.showcart .counter-label{display:inline-block;position:static;overflow:visible;width:auto;margin:0} 6 .page-header.type7 .header-contact {display: inline-flex;align-items: center;line-height: 22px;font-size: .9em;}
7 @media only screen and (max-width:767px){ 7 .page-header.type7 .header-contact .my-account {display: inline-block;padding: 0 .125rem;font-size: 24px;vertical-align: middle;}
8     .page-header.type7 .nav-toggle{float:left;margin-left:0} 8 .page-header.type7 .header-contact .my-account i,.page-header.type7 .header-contact .wishlist i {font-size: 27px;display: block;}
9     .page-header.type7 .logo{height:40px;float:right;margin:10px 0} 9 
.page-header.type7 .
header-contact p {margin: 0;}
10     .page-header.type7 .logo img{max-width:100%;max-height:100%;width:auto} 10 .page-header.type7 .search-area .minisearch .actions button {width: 42px;}
11     .page-header.type7 .panel.header .custom-block{display:none} 11 .page-header.type7 .search-category {left: 46px !important;}
12     .page-header.type7 .panel.header .toplinks-area{display:none} 12 .page-header.type7 .main-menu-wrap {background: #fff;}
13     .page-header.type7 .panel.header>span.split{display:none} 13 @media 
(max-width:991px)
{
14     .page-header.type7 .search-toggle-icon{display:none} 14   header.page-header.sticky-header .header-main 
{right: 0;}
15     .page-header.type7 .block-search .label{font-size:11px;text-transform:uppercase} 15   
.page-header.
type7
 .minicart-wrapper {margin-right: .3125rem;}
16     .page-header.type7 .block-search .label:before{margin-left:5px;color:#777;font-size:11px} 16   .page-header.type7 .main-menu-wrap {position: absolute; top: -100%;width: 0;overflow: hidden;}
17     .page-header.type7 .block-search .label>span{width:auto;height:auto;position:static} 17   .sw-megamenu.navigation.side-megamenu {display: block;}
18     .page-header.type7 .minicart-wrapper{margin-top:4px;margin-right:15px} 18   .page-header.type7 .menu-custom-block,.sw-megamenu.navigation li.ui-menu-item > a i {display: none}
19 } 19   .page-header.type7 .custom-block {display: none;}
20 @media all and (min-width:768px),print{    
21     header.page-header.sticky-header.type7:not(.header-newskin) .nav-sections{background-color:#fff}    
22     header.page-header.sticky-header.type7:not(.header-newskin) .logo{display:block}    
23     header.page-header.sticky-header.type7:not(.header-newskin) .navigation>ul>li{float:none !important}    
24     header.page-header.sticky-header.type7:not(.header-newskin) .minicart-wrapper
{margin-top:-10px}
    
25     .page-header.type7{border-top:0}    
26     .page-header.type7:not(.header-newskin) .panel.header .switcher{padding:0 15px;border-right:1px solid #ccc}    
27     .page-header.type7:not(.header-newskin) .panel.header .custom-block{float:left;font-size:11px}    
28     .page-header.type7:not(.header-newskin) .panel.header .toplinks-area{float:left;font-size:11px;position:relative}    
29     .page-header.type7:not(.header-newskin) .panel.header .toplinks-area>a{text-transform:uppercase}    
30     .page-header.type7:not(.header-newskin) .panel.header .toplinks-area>ul{position:absolute;right:0;top:100%;min-width:150px;padding:0;list-style:none;display:none}    
31     .page-header.type7:not(.header-newskin) .panel.header>span.split{float:left;height:15px}    
32     .page-header.type7:not(.header-newskin) .header.content{display:block;padding:28px 15px;text-align:center}    
33     .page-header.type7 .logo{display:inline-block;margin:0}    
34     .page-header.type7 .search-area{position:relative;margin:0;display:block;float:right;z-index:10}    
35     .page-header.type7 .search-area>a{display:block;margin-left:15px;text-align:center;font-size:11px;text-transform:uppercase;color:#777}    
36     .page-header.type7 .search-area>a:hover{text-decoration:none}    
37     .page-header.type7 .search-area>a em{margin-left:5px}    
38     .page-header.type7 .block-search{display:none;position:absolute;right:-20px;top:100%;margin:0;margin-top:20px}    
39     .page-header.type7 .block-search:before{content:"";display:block;position:absolute;top:-20px;right:20px;border:10px solid transparent;border-bottom-color:#ccc}    
40     .page-header.type7 .block-search input{height:45px;border-radius:25px;border:5px solid #ccc}    
41     .page-header.type7 .block-search .action.search{left:5px;height:45px;border-right:1px solid #ccc;width:40px}    
42     .page-header.type7:not(.header-newskin) .nav-sections{pointer-events:none;position:absolute;top:50%;margin-top:-25px;width:100%;right:0;padding-right:15px;padding-left:6px}    
43     .page-header.type7:not(.header-newskin) .navigation{padding:10px 0}    
44     .page-header.type7:not(.header-newskin) .navigation>ul{text-align:right}    
45     .page-header.type7:not(.header-newskin) .navigation>ul>li{pointer-events:all;text-align:right}    
46     .page-header.type7:not(.header-newskin) .navigation .level0>.level-top{color:#3d3734;line-height:30px;display:inline-block;transition-delay:0.3s}    
47     .page-header.type7:not(.header-newskin) .navigation .level0.active>.level-top,.page-header.type7 .navigation .level0.has-active>.level-top{color:#fff;background-color:#3d3734;border-radius:5px}    
48     .page-header.type7:not(.header-newskin) .navigation .level0.parent>a:after{line-height:30px}    
49     .page-header.type7:not(.header-newskin) .navigation .level0.parent:hover>.level-top{border-radius:5px 5px 0 0}    
50     .page-header.type7:not(.header-newskin) .navigation .level0:hover>.level-top{color:#fff;background-color:#3d3734;border-radius:5px}    
51 }    
52 @media (min-width: 768px) {    
53     .page-header.type7:not(.header-newskin) .panel.header .toplinks-area > ul.show {    
54         right: -15px;    
55         z-index: 7;    
56         background-color: #fff;    
57         box-shadow: 0 0 1px rgba(0,0,0,0.15);    
58         padding: 0 15px;    
59         margin-top: 10px;    
60     }    
61 }    
62     
63 .page-header.type7.header-newskin .minicart-wrapper .action.showcart:after {    
64     color: #606669;    
65 }    
66 .page-header.type7.header-newskin .minicart-wrapper .action.showcart:before,    
67 .page-header.type7.header-newskin .minicart-wrapper .action.showcart.active:before {    
68     font-size: 19px;    
69 }    
70 .page-header.type7.header-newskin.sticky-header .minicart-wrapper .action.showcart:before,    
71 .page-header.type7.header-newskin.sticky-header .minicart-wrapper .action.showcart.active:before {    
72     font-size: 25px;    
73 } 20 }
74 .page-header.type7.header-newskin .minicart-wrapper .action.showcart .counter.qty { 21 @media only screen and (max-width:767px){
75     width: 13px;    
76     height: 13px;    
77     line-height: 15px;    
78     margin-top: -15px;    
79     left: 15px;    
80     font-size: 9px;    
81 } 22 }
82 .page-header.type7.header-newskin .minicart-wrapper .action.showcart { 23 @media (min-width:992px) {
83     padding: 0 22px 0 0; 24 .page-header.type7 .header.panel > .header.links {display: flex;align-items: center;}
    25 .page-header.type7 .header.panel > .header.links > li > a {padding-top: 5px;padding-bottom: 5px;padding-left: 15px;padding-right: 15px;text-transform: capitalize;}
    26 .page-header.type7 .search-area .block.block-search {border: none;}
    27 header.page-header.type7.sticky-header .nav-sections {position: absolute !important;box-shadow: none;top: 100% !important;}
    28 header.page-header.type7.sticky-header .main-menu-wrap {position: fixed;z-index: inherit;box-shadow: 0 1px 2px rgb(0 0 0 / 10%);width: 100%;right: 0;top: 0;}
    29 header.page-header.type7.sticky-header .main-menu-wrap > .container {padding-left: 10px;padding-right: 10px;}
    30 header.page-header.type7.sticky-header .navigation {padding: 0;}
    31 .sw-megamenu.navigation.side-megamenu > ul {margin-top: -1px;}
    32 .sw-megamenu.navigation.side-megamenu li.level0 > a {
    33   font-family: Poppins,sans-serif;
    34   font-size: 14px;
    35   font-weight: 500;
    36   line-height: 25px;
    37   padding: 14px 12px;
    38   text-transform: capitalize;
84 } 39 }
85 .page-header.type7.header-newskin .minicart-wrapper .block-minicart:before { 40 .sw-megamenu.navigation.side-megamenu li.active + .level0 > a {
86     left: 41.7px; 41     border-top: 1px solid #e7e7e7;
87 } 42 }
88 .page-header.type7.header-newskin .minicart-wrapper .block-minicart:after { 43 .sw-megamenu.navigation.side-megamenu li.level0:hover > a {
89     left: 41px; 44     border-top-color: #e7e7e7 !important;
90 } 45 }
91 @media (min-width: 768px) { 46 .sw-megamenu.navigation.side-megamenu li.level0 > a > i + span:not(.cat-label) {margin-right: 4px;}
92     .page-header.type7.header-newskin { 47 .sw-megamenu.navigation.side-megamenu li.level0.menu-item-sale > a {
93         border-top0; 48     border-topnone;
94     } 49     background: #f4f4f4;
95     .page-header.type7.header-newskin .panel.wrapper { 50     margin: 8px 18px 20px;
96         border-bottom: #eee solid 2px;    
97     }    
98     .page-header.type7.header-newskin .panel.header {    
99         padding-top: 0;    
100         padding-bottom: 0;    
101     }    
102     .page-header.type7.header-newskin .search-area {    
103         position: relative;    
104         margin: 0;    
105         display: block;    
106         float: right;    
107         z-index: 10;    
108         height: 39px;    
109     }    
110     .page-header.type7.header-newskin .search-area > a {    
111         display: block;    
112         margin-left: 15px;    
113         text-align: center;    
114         font-size: 13px;    
115         text-transform: uppercase;    
116         color: #777;    
117         line-height: 39px;    
118     }    
119     .page-header.type7.header-newskin .search-area > a em {    
120         margin-left: 5px;    
121     }    
122     .page-header.type7.header-newskin .block-search {    
123         display: none;    
124         position: absolute;    
125         right: -20px;    
126         top: 100%;    
127         margin: 0;    
128         margin-top: 0;    
129     }    
130     .page-header.type7.header-newskin .block-search input {    
131         height: 45px;    
132         border-radius: 25px;    
133         border: 5px solid #ccc;    
134     }    
135     .page-header.type7.header-newskin .block-search .action.search {    
136         left: 5px;    
137         height: 45px;    
138         border-right: 1px solid #ccc;    
139         width: 40px;    
140     }    
141     .page-header.type7.header-newskin .panel.header .switcher {    
142         padding: 12px 15px;    
143         height: 39px;    
144     }    
145     .page-header.type7.header-newskin .panel.header .switcher strong {    
146         font-size: 13px;    
147         text-transform: uppercase;    
148     }    
149     .page-header.type7.header-newskin .minicart-wrapper {    
150         position: relative;    
151         margin: 5px 0 0 0;    
152         float: left;    
153         width: 42px;    
154     }        
155     .page-header.type7.header-newskin.sticky-header .minicart-wrapper {    
156         position: absolute;    
157         left: 15px;    
158         top: 50%;    
159         margin-top: -20px;    
160     }    
161     .page-header.type7.header-newskin .panel.header > span.split {    
162         float: left;    
163         height: 39px;    
164         border-left-color:#eee;    
165         border-left-width: 2px;    
166         width: 1px;    
167         margin: 0 18px
;
    
168     }    
169     .page-header.type7.header-newskin .panel.header .toplinks-area {    
170         float: left;    
171         font-size: 13px;    
172         position: relative;    
173         line-height: 39px;    
174     }    
175     .page-header.type7.header-newskin .panel.header .custom-block {    
176         float: left;    
177         font-size: 13px;    
178         line-height: 39px;    
179     }    
180     .page-header.type7.header-newskin .header.content {    
181         display: block;    
182         padding: 28px 15px;    
183         text-align: center; 51     text-align: center;
184     } 52     color: #222529!important;
185     .page-header.type7.header-newskin .logo { 53     font-weight: 700!important;
186         display: inline-block;    
187         margin: 0;    
188     }    
189     .page-header.type7.header-newskin .nav-sections {    
190         pointer-events: none;    
191         position: absolute;    
192         top: 50%;    
193         margin-top: -22px;    
194         width: 100%;    
195         right: 0;    
196         padding-right: 15px;    
197         padding-left: 6px;    
198     }    
199     .page-header.type7.header-newskin.sticky-header .nav-sections {    
200         pointer-events: all;    
201     }    
202     .page-header.type7.header-newskin .navigation > ul {    
203         text-align: right;    
204     }    
205     .page-header.type7.header-newskin .navigation > ul > li {    
206         pointer-events: all;    
207         text-align: right;    
208     }    
209     .page-header.type7.header-newskin .navigation .level0 > .level-top {font-weight: 500;}    
210     .page-header.type7.header-newskin:not(.sticky-header) .navigation li.level0 > .level-top:first-child {padding-right: 0;}    
211     .page-header.type7.header-newskin .navigation .level0.parent > a:after {line-height:41px;}    
212     .page-header.type7.header-newskin.sticky-header .navigation .level0.parent > a:after {line-height:28px;}    
213 }    
214 @media (min-width:992px){    
215     .page-header.type7.header-newskin .panel.header .toplinks-area > a {    
216         display:none;    
217     }    
218     .page-header.type7.header-newskin .panel.header .toplinks-area ul {    
219         display: inline-block;    
220         margin: 0;    
221         padding: 0;    
222     }    
223     .page-header.type7.header-newskin .panel.header .toplinks-area ul li {    
224         display: inline-block;    
225         margin: 0;    
226         text-transform: uppercase;    
227     }    
228     .page-header.type7.header-newskin .panel.header .toplinks-area ul li a {    
229         padding: 0 10px;    
230     }    
231     .page-header.type7.header-newskin .panel.header .toplinks-area ul li > span {    
232         padding: 0 10px;    
233     }    
234 }    
235 @media (max-width: 1199px) {    
236     .page-header.type7.header-newskin .panel.header .custom-block {    
237         display: none;    
238     }    
239 }    
240 @media (max-width:991px) and (min-width:768px){    
241     .page-header.type7.header-newskin .panel.header .toplinks-area > a {    
242         text-transform: uppercase;    
243         display:inline-block;    
244     }    
245     .page-header.type7.header-newskin .panel.header .toplinks-area > ul {    
246         position: absolute;    
247         right: 0;    
248         top: 100%;    
249         min-width: 150px;    
250         padding: 0;    
251         list-style: none;    
252         display: none;    
253         line-height: 24px;    
254     }    
255     .page-header.type7.header-newskin .panel.header .toplinks-area > ul.show {    
256         left: -18px;    
257         right: auto;    
258         z-index: 7;    
259         background-color: #fff;    
260         box-shadow: 0 0 1px rgba(0,0,0,0.15);    
261         padding: 10px 15px;    
262         margin-top: 1px;    
263     }    
264     header.page-header.type7.header-newskin.sticky-header .navigation li.level0 > .level-top {    
265         padding: 0 7px;    
266     }    
267 }    
268 @media (max-width: 767px) {    
269     .page-header.type7.header-newskin .minicart-wrapper {    
270         position: absolute;    
271         top: 100%;    
272         left: 0;    
273         right: auto;    
274         margin: 10px 0;    
275         z-index: 1;    
276     }    
277     .page-header.type7.header-newskin .panel.header .toplinks-area {    
278         display: none;    
279     }    
280     .page-header.type7.header-newskin .panel.header .custom-block {    
281         display: none;    
282     }    
283     .page-header.type7.header-newskin .logo {    
284         height: 40px;    
285         float: right;    
286         margin: 10px 0;    
287     }    
288     .page-header.type7.header-newskin .logo img {    
289         max-width: 100%;    
290         max-height: 100%;    
291         width: auto;    
292     }    
293     .page-header.type7.header-newskin .search-toggle-icon {    
294         display: none;    
295     }    
296     .page-header.type7.header-newskin .block-search .label {    
297         font-size: 11px;    
298         text-transform: uppercase;    
299     }    
300     .page-header.type7.header-newskin .block-search .label > span {    
301         width: auto;    
302         height: auto;    
303         position: static;    
304         display: inline-block;    
305         vertical-align: middle;    
306         line-height: 28px;    
307     }    
308     .page-header.type7.header-newskin .block-search .label:before {    
309         margin-left: 5px;    
310         color: #777;    
311         font-size: 11px;    
312         display: inline-block;    
313         vertical-align: middle;    
314     }    
315     .page-header.type7.header-newskin .header.panel {    
316         position: relative;    
317     }    
318     .page-header.type7.header-newskin .panel.header > span.split {    
319         display: none;    
320     }    
321     .page-header.type7.header-newskin .minicart-wrapper .action.showcart .counter.qty {color: #fff;}    
322     .page-header.type7.header-newskin .nav-toggle {    
323         float: left;    
324         margin-left: 5px;    
325     }    
326     .page-header.type7.header-newskin .nav-toggle:before {    
327         font-size: 17px;    
328     }    
329 } 54 }
330 .page-header.type7.header-newskin.sticky-header .minicart-wrapper .action.showcart.active:before { 55 .page-header .sw-megamenu.navigation li.level0.staticwidth > .submenu .level1 > a,
331     margin-top: -2px; 56 .page-header .sw-megamenu.navigation li.level0.fullwidth > .submenu .level1 > a {
    57     color: #333;
332 } 58 }
333 .page-header.type7 .search-category select {    
334     border: 0;    
335     border-right: 1px solid #ccc;    
336     border-right-color: rgba(204,204,204,0.5);    
337 } 59 }